From 6f34f863c4f0dcf6d89f305ca533f2a34402b591 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 2 Jul 2017 13:04:16 +0200 Subject: [PATCH] Let the cargo_bench_failing_test tolerate col info Needed by https://github.com/rust-lang/rust/pull/42938 --- tests/bench.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/bench.rs b/tests/bench.rs index ae7156de1..6a49632ee 100644 --- a/tests/bench.rs +++ b/tests/bench.rs @@ -245,7 +245,7 @@ thread '[..]' panicked at 'assertion failed: \ `(left == right)`[..]", p.url())) .with_stderr_contains("[..]left: `\"hello\"`[..]") .with_stderr_contains("[..]right: `\"nope\"`[..]") - .with_stderr_contains("[..]src[/]foo.rs:14") + .with_stderr_contains("[..]src[/]foo.rs:14[..]") .with_status(101)); } @@ -295,7 +295,7 @@ fn bench_with_lib_dep() { [FINISHED] release [optimized] target(s) in [..] [RUNNING] target[/]release[/]deps[/]foo-[..][EXE] [RUNNING] target[/]release[/]deps[/]baz-[..][EXE]", p.url())) - .with_stdout_contains("test lib_bench ... bench: [..]") + .with_stdout_contains("test lib_bench ... bench: [..]") .with_stdout_contains("test bin_bench ... bench: [..]")); } @@ -695,7 +695,7 @@ fn bench_dylib() { [RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench` [RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`", dir = p.url())) .with_stdout_contains_n("test foo ... bench: [..]", 2)); - + p.root().move_into_the_past(); assert_that(p.cargo("bench").arg("-v"), execs().with_status(0) -- 2.30.2